Update to new Pango API.

2001-11-18  Alex Larsson  <alexl@redhat.com>

	* gdk/x11/gdkfont-x11.c (gdk_font_from_description):
	Update to new Pango API.

diff --git a/ChangeLog b/ChangeLog
index fe6716b28c5178a7e7af7df4c1de76b67627b985..5eeecce69ae70f50d39a02f48babee253dca45c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-18  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_from_description):
+       Update to new Pango API.
+       
 Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fe6716b28c5178a7e7af7df4c1de76b67627b985..5eeecce69ae70f50d39a02f48babee253dca45c4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-11-18  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_from_description):
+       Update to new Pango API.
+       
 Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fe6716b28c5178a7e7af7df4c1de76b67627b985..5eeecce69ae70f50d39a02f48babee253dca45c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-11-18  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_from_description):
+       Update to new Pango API.
+       
 Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fe6716b28c5178a7e7af7df4c1de76b67627b985..5eeecce69ae70f50d39a02f48babee253dca45c4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-11-18  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_from_description):
+       Update to new Pango API.
+       
 Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fe6716b28c5178a7e7af7df4c1de76b67627b985..5eeecce69ae70f50d39a02f48babee253dca45c4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-11-18  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_from_description):
+       Update to new Pango API.
+       
 Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fe6716b28c5178a7e7af7df4c1de76b67627b985..5eeecce69ae70f50d39a02f48babee253dca45c4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-11-18  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_from_description):
+       Update to new Pango API.
+       
 Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fe6716b28c5178a7e7af7df4c1de76b67627b985..5eeecce69ae70f50d39a02f48babee253dca45c4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-11-18  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_from_description):
+       Update to new Pango API.
+       
 Sun Nov 18 19:47:29 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the

diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 1115c011ba79e8b220519bd848e2156591c2ac00..4cf8a4d747bb0483435e8fb2ce42f6850358dfe3 100644 (file)
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -209,7 +209,7 @@ gdk_font_from_description (PangoFontDescription *font_desc)
   g_return_val_if_fail (font_desc != NULL, NULL);
 
   font_map = pango_x_font_map_for_display (GDK_DISPLAY ());
-  font = pango_font_map_load_font (font_map, font_desc);
+  font = pango_font_map_load_font (font_map, NULL, font_desc);
 
   if (font)
     {